JIT: fix bug in cloning conditions for jagged array #83414
Conversation
When checking that an inner array access is in bounds, we must ensure any outer access is fully in bounds too. We were checking that `idx < array.Len` but not that `idx >= 0`. Use an unsigned compare for this check so we can do both sides with a single instruction. Fixes dotnet#83242.
dotnet-issue-labeler
bot
added
the
area-CodeGen-coreclr
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch, @kunalspathak Issue DetailsWhen checking that an inner array access is in bounds, we must ensure any outer access is fully in bounds too. We were checking that Use an unsigned compare for this check so we can do both sides with a single instruction. Fixes #83242.
|
|
@BruceForstall PTAL We will want to backport this to .NET 7. Expecting some minor diffs (maybe 20 cases across SPMI). |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4427678261 |
|
@AndyAyersMS backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: JIT: fix bug in cloning conditions for jagged array
.git/rebase-apply/patch:126: trailing whitespace.
.git/rebase-apply/patch:133: trailing whitespace.
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/coreclr/jit/loopcloning.cpp
M src/coreclr/jit/loopcloning.h
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/jit/loopcloning.h
Auto-merging src/coreclr/jit/loopcloning.cpp
CONFLICT (content): Merge conflict in src/coreclr/jit/loopcloning.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 JIT: fix bug in cloning conditions for jagged array
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@AndyAyersMS an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
…3414) Backport of #83414 to release/7.0, fixes #83242 When checking that an inner array access is in bounds, we must ensure any outer access is fully in bounds too. We were checking that `idx < array.Len` but not that `idx >= 0`. Use an unsigned compare for this check so we can do both sides with a single instruction. Fixes #83242.
…3414) (#83462) Backport of #83414 to release/7.0, fixes #83242 When checking that an inner array access is in bounds, we must ensure any outer access is fully in bounds too. We were checking that `idx < array.Len` but not that `idx >= 0`. Use an unsigned compare for this check so we can do both sides with a single instruction. Fixes #83242.
ghost
locked as resolved and limited conversation to collaborators
When checking that an inner array access is in bounds, we must ensure any outer access is fully in bounds too. We were checking that
idx < array.Lenbut not thatidx >= 0.Use an unsigned compare for this check so we can do both sides with a single instruction.
Fixes #83242.